Merge pull request #21 from pdpiech/master

Fix compilation errors, Android naming scheme