@Mamute: Fixes #98.
@Mamute: Fixes #100.
Merge pull request #3 from ARNdroid/develop

Full update from central repository