Merge pull request #11 from rjrudman/10

#10
Merge pull request #13 from rjrudman/12

#12
#12
Fixed