Merge pull request #28 from zandroid/master

Some improvements and bugs fixing.
Small codingstyle changes + new bugfix version