modified to take full parameterization
added sample output
updated samples
Merge branch 'development'