Merge pull request #1 from arekusuri/dev

commit all files
change private to protected for 2 functions and clean up space at end of lines