merge
i take too long to do simple tasks
made some minor transitions
Merge pull request #34 from lapty/master

made some minor transitions