seems to work
solved conflict
changes
Merge pull request #50 from nens/jack-edit

Jack edit