Follow convention or get you teeth kicked in... (ref #14)
Merge pull request #15 from reinetwork/ticket_14

Closes #14