cannons fixed
Merge pull request #13 from nejc92/master

cannons fixed