closes #159 - @almossawi take a look at dev and let me know what you think.