Added accidently removed features from #7