close#32
Merge pull request #33 from axce1/dj17

close#32