Merge pull request #26 from martinghunt/master

sync with martinghunt (no changes)