improve naming conventions - fixes #6 #10
Merge pull request #11 from orta/master

@ashfurrow => improve naming conventions - fixes #6 #10