Better version information. Close #20