Version 0.3 - bug fixes