Merge pull request #15 from DaveAckley/master

catch up
preceding --, ++
Merge pull request #37 from elenasa/master

Catch up