#23
Merge pull request #25 from TramDo/master

#23