Fix for issue 1

Also removed unused dependency on junit.