Fixed Compile Errors
Merge branch 'master' of github.com:Binero/Nectar