Merge pull request #927 from dsheets/master

+ipaddr.0.2.0
+ipaddr.0.2.1