Merge pull request #39 from untergeek/master

Changes for next revision started.