Fixes #6, #10, #12, #13, #14
Merge pull request #15 from mindaugasbarysas/issue-fixes

Fixes #6, #10, #12, #13, #14