Pre-release

A pre-release for testing purposes. Code suggestions welcome. Particularly simplification of code.