merge with Nicos version

This commit is contained in:
Vitor Santos Costa
2014-07-09 13:14:22 -05:00
parent e167cdfa4c
commit c9abfc28d7