Fixed everything
Merge pull request #6 from villa7/master

Fixed everything