version 0.2 update
version 0.2
merging cleanup into master