closes #15 
#10 - removed some deprecated methods and added comments.