Merge pull request #28 from reekoheek/master

misc