Version 0.1.8: Cleaning code

By Anatoly Mironov