Implemented all strategy.
Corrected minor bugs at runtime.
Merge branch 'issue14'