Merge pull request #4 from dasniko/master

housekeeping