Code Kukarektoring (2)

Since previous pull request was kukarekted, I am opening a new one. Please see #7 for discussion.