Merge pull request #38 from mmattioli/master

Housekeeping/Consistency Updates
create a stable branch todo item
Merge pull request #18 from psychomario/master

update from original