Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from autowarefoundation:main #18

Merged
merged 83 commits into from
Jul 26, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Jul 18, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

kosuke55 added 2 commits July 18, 2023 00:23
…nes (#4300)

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
purewater0901 and others added 4 commits July 18, 2023 09:29
…4288)

* refactor(lane_change): fix lane change variable names inconsistency

Signed-off-by: yutaka <purewater0901@gmail.com>

* update

Signed-off-by: yutaka <purewater0901@gmail.com>

---------

Signed-off-by: yutaka <purewater0901@gmail.com>
)

* update first conflicting/attention area

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

* debug 1113, 1393

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

* migrated to latest

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

---------

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
refactor(avoidance): update parameter names

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Jul 18, 2023
kosuke55 and others added 2 commits July 18, 2023 11:34
* fix(goal_planner): fix publishing new modified goal

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* style(pre-commit): autofix

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…_filter (#4127)

* feat(radar_crossing_objects_noise_filter): add radar_crossing_objects_noise_filter

Signed-off-by: scepter914 <scepter914@gmail.com>

* style(pre-commit): autofix

* update README

Signed-off-by: scepter914 <scepter914@gmail.com>

* update README

Signed-off-by: scepter914 <scepter914@gmail.com>

* style(pre-commit): autofix

* change default parameter

Signed-off-by: scepter914 <scepter914@gmail.com>

* update README

Signed-off-by: scepter914 <scepter914@gmail.com>

* update README

Signed-off-by: scepter914 <scepter914@gmail.com>

---------

Signed-off-by: scepter914 <scepter914@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
kosuke55 and others added 4 commits July 18, 2023 03:33
* fix(start_planner): fix loop lanes

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add empty check

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
refactor(no_drivable_lane): remove rtc from readme

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
soblin and others added 2 commits July 18, 2023 20:27
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
…_module (#4319)

* fix(ndt_scan_matcher): Update member variables properly in map_update_module

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* dummy fix

Signed-off-by: kminoda <koji.minoda@tier4.jp>

---------

Signed-off-by: kminoda <koji.minoda@tier4.jp>
* fix(occlusion_spot): add lacking param (#4290)

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): add cspell-partial.json

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): add spell-check-partial.yaml

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): fix spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* style(pre-commit): autofix

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* feat(tier4_autoware_utils): add intersect function (#4312)

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): test spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): revert spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Takayuki Murooka <takayuki5168@gmail.com>
@github-actions github-actions bot added the ci label Jul 18, 2023
kminoda and others added 2 commits July 18, 2023 21:29
* fix(occlusion_spot): add lacking param (#4290)

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): add cspell-partial.json

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): add spell-check-partial.yaml

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): fix spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* style(pre-commit): autofix

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* feat(tier4_autoware_utils): add intersect function (#4312)

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): test spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* chore(cspell): revert spell-check-partial

Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>

* feat(ci): enable spell-check-partial for map component

Signed-off-by: kminoda <koji.minoda@tier4.jp>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
Co-authored-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Takayuki Murooka <takayuki5168@gmail.com>
… methods (#4257)

* feat(tier4_localization_launch): add pose_twist_estimator.launch.py

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* update format

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* update launcher

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* update pose_initailizer config

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Move pose_initializer to pose_twist_estimator.launch.py, move yabloc namespace

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* use launch.xml instead of launch.py

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Validated that all the configuration launches correctly (not performance eval yet)

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Remove arg

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* style(pre-commit): autofix

* Update eagleye param path

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* minor update

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix minor bugs

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix minor bugs

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Introduce use_eagleye_twist args in eagleye_rt.launch.xml to control pose/twist relay nodes

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Update pose_initializer input topic when using eagleye

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Add eagleye dependency in tier4_localization_launch

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Update tier4_localization_launch readme

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* style(pre-commit): autofix

* Update svg

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* Update svg again (transparent background)

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* style(pre-commit): autofix

* Update yabloc document

Signed-off-by: kminoda <koji.minoda@tier4.jp>

---------

Signed-off-by: kminoda <koji.minoda@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
takayuki5168 and others added 3 commits July 19, 2023 09:02
…op line calculation (#4284)

* refactor crosswalk stop line calculation

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

---------

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
* fix(yabloc): fix typo

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix Kinv and mean_pose

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* style(pre-commit): autofix

* fix normalized term

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix resamping

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* style(pre-commit): autofix

* fix reweight

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix typo

Signed-off-by: kminoda <koji.minoda@tier4.jp>

---------

Signed-off-by: kminoda <koji.minoda@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
kosuke55 and others added 2 commits July 24, 2023 13:44
…lanelet (#4360)

* fix(behavior_path_planner): update root lanele if it is not in route lanelet

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* Update planning/behavior_path_planner/src/planner_manager.cpp

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>
* Option for how to publish gnss_pose

* Readme updated

* style(pre-commit): autofix

* typo is corrected

* style(pre-commit): autofix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
kminoda and others added 26 commits July 24, 2023 05:58
Signed-off-by: kminoda <koji.minoda@tier4.jp>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
* fix(yabloc): fix spell-check

Signed-off-by: kminoda <koji.minoda@tier4.jp>

* fix(yabloc): fix spell-check 'vectormap'

Signed-off-by: kminoda <koji.minoda@tier4.jp>

---------

Signed-off-by: kminoda <koji.minoda@tier4.jp>
* feat(avodiance_by_lc): make it possible to configurate flexibly

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* feat(avodiance_by_lc): avoid only close object

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* fix(avoidance_by_lc): use std::any_of

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
…tprint marker (#4193)

* fix(obstacle_avoidance_planner): adding missing functionality for footprint marker

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>

---------

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
…4361)

* update tracking/perception launch

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* switch tracker launcher mode with argument

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* add radar tracker dependency

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

---------

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
Co-authored-by: Shunsuke Miura <37187849+miursh@users.noreply.github.com>
… from autoware_launch (#4278)

* init commit

Signed-off-by: ismetatabay <ismet@leodrive.ai>

* add centerpoints param

Signed-off-by: ismetatabay <ismet@leodrive.ai>

* add detection_class_remapper.param.yaml

Signed-off-by: ismetatabay <ismet@leodrive.ai>

* remove unused centerpoint param path

Signed-off-by: ismetatabay <ismet@leodrive.ai>

---------

Signed-off-by: ismetatabay <ismet@leodrive.ai>
Co-authored-by: Yusuke Muramatsu <yukke42@users.noreply.github.com>
…he option (#4382)

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
* feat(obstacle_cruise_planner): single slow down virtual wall

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

---------

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
#4314)

* fix:5cls

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: division to multiplication

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: multi thread

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: iou_bev_nms

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: use class names and order in config

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: model url

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: delete printf

Signed-off-by: tzhong518 <sworgun@gmail.com>

* add: set omp_num_threads in config

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: missed commit

Signed-off-by: tzhong518 <sworgun@gmail.com>

* style(pre-commit): autofix

* fix: class according to config

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: variable

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: precommit

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: magic number and division

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: magic number

Signed-off-by: tzhong518 <sworgun@gmail.com>

* style(pre-commit): autofix

* fix: yaw norm thresholds

Signed-off-by: tzhong518 <sworgun@gmail.com>

* fix: publish output_msg before postprocess

Signed-off-by: tzhong518 <sworgun@gmail.com>

---------

Signed-off-by: tzhong518 <sworgun@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…nitions (#4356)

Signed-off-by: ismetatabay <ismet@leodrive.ai>
…t (lanelet not in routing graph) (#4353)

* enable prediction to adjacent lanelet

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* add function to get unconnected lanelet in graph

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

* add function to generate possiblepath from isolated lanelets

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

* precommit fix

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

* fix typo and unnecessary descriptions

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

* use lambda function to define lanelet path extractor

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

* add lambda function to get left/right lanelet

Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>

---------

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
Signed-off-by: Yoshi, Ri <yoshiyoshidetteiu@gmail.com>
… path (#4303)

Signed-off-by: Maxime CLEMENT <maxime.clement@tier4.jp>
…d in z axis (#4243)

* fix(compare_map_segmentation): keep low level pointcloud

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix: add option to compare lower neighbor points

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* docs: readme update

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix: add param to launch

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* Revert "fix(compare_map_segmentation): keep low level pointcloud"

This reverts commit eb07f95.

* fix: reduce z distance of low level neighbor point

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix: reduce voxel leaf size in z axis

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix: change param type

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

---------

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>
…4385)

* fix: add unuse downsample launch option

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix: add default param for downsample option

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>

* fix typo

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

---------

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>
Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>
Co-authored-by: Shunsuke Miura <shunsuke.miura@tier4.jp>
* feat(dynamic_avoidance): consider a wider range of objects

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* fix

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update config

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

---------

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
* feat(behavior_path_planner): output drivable lanes marker

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* feat(avoidance): output drivable lanes marker

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
* feat: add curvature consideration in shift start

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* fix

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

---------

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
…utput synchronized pointcloud (#3312)

* feat: fix concatenate pc compensation order

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* feat: add transformed raw pc output to concat func

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* fix: concat pc to sync with oldest time stamp

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* feat: add time sync node component

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* refactor: time synchronizer class

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* feat: add pc concatenate node

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* rename existing concat node file

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* update concat_node  launch to choose two methods

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* update readme usage explanation

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* add parameter to control publisher of the synched pointclouds

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

* Fix  readme for pc concatenation

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>

---------

Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
…vehicle dir (#4327)

Signed-off-by: kminoda <koji.minoda@tier4.jp>
Co-authored-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
* refactor(safety_checker): remove lane change dependency

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* refactor(safety_checker): init primitive member variables

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
…elets (#4380)

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
* refactor: fix spell-check

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* fix spell-check

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* fix typo

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* Fix obvious typo, shortened words

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* Fix obvious typo, shortened words, in common directory

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* add cspell ignore

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>

* Update perception/tensorrt_classifier/CMakeLists.txt

Co-authored-by: Yusuke Muramatsu <yukke42@users.noreply.github.com>

---------

Signed-off-by: Shunsuke Miura <shunsuke.miura@tier4.jp>
Co-authored-by: Yusuke Muramatsu <yukke42@users.noreply.github.com>
@1222-takeshi 1222-takeshi merged commit 13b96ad into 1222-takeshi:main Jul 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.