Merge pull request #10 from marksrcn/master

Minor fix and features