Pull request for issue #53

Initial draft for the commit to #53 
After we confirm all the changes I'll combine my commits together