Creating issue 53.
Resolving to merge of Issue 53 with master.