Last fixes for 1.5 rebase
Merge pull request #7 from ares/master

Last fixes for 1.5 rebase