Version 0.1e

Some code cleanup