Solved most of the problems.
Merge pull request #2 from jkaleta/master

Untitled