Cleaned up and improved commenting in the adapter class.
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev