mivion Merge pull request #24 from bittnkr/master