#122 #123 #124

Resolved issues #122 #123 #124

Thanks in advance