Merge remote-tracking branch 'upstream/dev' into markov
Merge remote-tracking branch 'upstream/dev' into dev
Some minor changes in doc and function definations
Merge branch 'markov' into dev
Merge pull request #209 from ankurankan/dev

minor changes