syncing up

Replacement PR for #33 - see comments there (this lazy bum is not going to repeat himself)
This one should be merge-able.