Initial import of version 0.3