Yuriy issues

Results 3 issues of


                                            Yuriy

![2015-04-15_1630](https://cloud.githubusercontent.com/assets/2083992/7159749/0ae1e32e-e38d-11e4-98e6-5b4e4ddc7f7e.png)

enhancement

enhancement

Fixes #36