Fixed unchecked warnings.
Removed unused class.
Merge branch 'pr/62'

closes #62