issue #25 progress
Revert "issue #25 progress"

This reverts commit 3a37ac9542aaef2ea75d7100c524bd05fbc09c4a.
issue #25 progress