manually merged changes from a2702fe5ad8a703124d5a08d5757b8f0eddccbcb to address #152
realigning things
trailing spaces
trailing spaces
made progress on #152 closes #151.