removed some warnings
Merge branch 'pr/57'