merge
update
Merge pull request #20 from PatrickHeneise/master

some updated, android issues should be resolved. Merge with original repo to avoid conflicts. - Patrick Heneise