Merge pull request #333 from shaitanelnifi/master

some changes that need merging