Merge pull request #1 from benrhughes/dev

Pull from benrhughes:dev
Cleanup after merge conflict on issue #218
Merge pull request #260 from Piscean/master

Cleanup after merge conflict on issue #218