Merge pull request #3 from K0F/master

Merge pull request #1 from CAS-FAMU/master
Merge pull request #2 from CAS-FAMU/master

Merge pull request #3 from K0F/master