Development

Fixed some issues for 0.1 release