Code

working toward 0.5.2 release