Merge pull request #7 from mercviper/master

Merging old branch