final tweeks
Merge pull request #1 from phy6phs/master

final tweeks