Version 0.3

Work in progress