Merge pull request #22 from h2r/master

pulling from master
pour action bug
Merge pull request #23 from h2r/moveAction

Move action
Merge pull request #25 from h2r/master

Re merging