Merge pull request #15 from stoe/master

misc changes (please see comment)