Merge pull request #29 from mechaet/master

Variables cleaned