Issue40 41

new PR with formating corrected