Merge pull request #143 from polynickglot/master

Closes #140 - Swap  with oboe implementation