fix stuff for 1.5.2-R0.1
Merge pull request #3 from hydrox/master

Fix for 1.5.2
Updates sources and build files to 1.6.1.
performance fixes